From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 16 Sep 2011 15:15:38 +0000 (-0700)
Subject: Merge from trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=14a1a9e5a4c87826012a3792a9d866ea5fe58cc7;p=emacs.git

Merge from trunk
---

14a1a9e5a4c87826012a3792a9d866ea5fe58cc7